Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to CloudForms 4.6.2 templates #8297

Merged
merged 2 commits into from May 9, 2018
Merged

Update to CloudForms 4.6.2 templates #8297

merged 2 commits into from May 9, 2018

Conversation

simaishi
Copy link
Contributor

@simaishi simaishi commented May 8, 2018

The latest CloudForms templates that go with CF 4.6.2 release.

I'm updating https://github.com/openshift/openshift-ansible/tree/master/roles/openshift_examples/files/examples/v3.10 as well, just to keep the files in sync withroles/openshift_management/files/templates/cloudforms but I don't know if CF 4.6 works on v3.10 or not...

cc @sdodson

@openshift-ci-robot openshift-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 8, 2018
@papr-bot
Copy link

papr-bot commented May 8, 2018

Can one of the admins verify this patch?
I understand the following commands:

  • bot, add author to whitelist
  • bot, test pull request
  • bot, test pull request once

@sdodson
Copy link
Member

sdodson commented May 8, 2018

bot, add author to whitelist

@sdodson
Copy link
Member

sdodson commented May 8, 2018

/ok-to-test

@openshift-ci-robot openshift-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 8, 2018
@sdodson
Copy link
Member

sdodson commented May 8, 2018

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 8, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sdodson, simaishi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 8, 2018
@sdodson
Copy link
Member

sdodson commented May 8, 2018

/test gcp

@sdodson
Copy link
Member

sdodson commented May 8, 2018

bot, retest this please

1 similar comment
@vrutkovs
Copy link
Member

vrutkovs commented May 9, 2018

bot, retest this please

@vrutkovs vrutkovs merged commit 89c68aa into openshift:master May 9, 2018
@simaishi simaishi deleted the cf462_update branch May 9, 2018 12:58
@carbonin
Copy link
Member

I think this needs to be included on every version of openshift which includes CF 4.6 ... Which I think is everthing >= 3.6.

Otherwise when people install with the latest images but with outdated templates they will run into issues like this https://bugzilla.redhat.com/show_bug.cgi?id=1579029

What is the process for getting this backported @sdodson ?

cc @chrispy1

@sdodson
Copy link
Member

sdodson commented May 17, 2018

It's in 3.9 and 3.7. It's not in 3.6 though.

@sdodson
Copy link
Member

sdodson commented May 17, 2018

/cherrypick release-3.9

@sdodson
Copy link
Member

sdodson commented May 17, 2018

/cherrypick release-3.7

@openshift-cherrypick-robot
Copy link

@sdodson: #8297 failed to apply on top of branch "release-3.9":

Applying: Update cloudforms templates to be in sync with roles/openshift_management/files/templates/cloudforms
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	roles/openshift_examples/files/examples/v3.10/cfme-templates/cfme-backup-job.yaml
A	roles/openshift_examples/files/examples/v3.10/cfme-templates/cfme-restore-job.yaml
A	roles/openshift_examples/files/examples/v3.10/cfme-templates/cfme-template-ext-db.yaml
A	roles/openshift_examples/files/examples/v3.10/cfme-templates/cfme-template.yaml
Falling back to patching base and 3-way merge...
Auto-merging roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-template.yaml
CONFLICT (content): Merge conflict in roles/openshift_examples/files/examples/v3.9/cfme-templates/cfme-template.yaml
Auto-merging roles/openshift_examples/files/examples/v3.7/cfme-templates/cfme-template-ext-db.yaml
Patch failed at 0002 Update cloudforms templates to be in sync with roles/openshift_management/files/templates/cloudforms

In response to this:

/cherrypick release-3.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot
Copy link

@sdodson: #8297 failed to apply on top of branch "release-3.7":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	roles/openshift_management/files/templates/cloudforms/cfme-template-ext-db.yaml
M	roles/openshift_management/files/templates/cloudforms/cfme-template.yaml
Falling back to patching base and 3-way merge...
Auto-merging roles/openshift_management/files/templates/cloudforms/cfme-template.yaml
CONFLICT (content): Merge conflict in roles/openshift_management/files/templates/cloudforms/cfme-template.yaml
Auto-merging roles/openshift_management/files/templates/cloudforms/cfme-template-ext-db.yaml
Patch failed at 0001 Update to CloudForms 4.6.2 templates

In response to this:

/cherrypick release-3.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sdodson sdodson Awaiting requested review from sdodson

@vrutkovs vrutkovs Awaiting requested review from vrutkovs

Assignees

@sdodson sdodson

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@simaishi @papr-bot @sdodson @openshift-ci-robot @vrutkovs @carbonin @openshift-cherrypick-robot